Game code cleanup