Add Cleanup method, also fix #region error messages.