Cleaning up gamer references in code