Clean up gametype determination