Code Cleanup: Home and GcWindows

Tidy up code, removing XXX and comemnted out blocks
of code in preparation for V3.0 release.