Code cleanup for GCC + GameObject enhancements