Moved the Dispose code to OnUnload

 * Was having an exception on Texture2D.Dispose due to the absence of a context
 * Removed temporary comments too
Removed excess new lines