ImageWindow Cleanup

Removes commented-out code from ImageWindow
More Cleanup

Yeah