removed unused class and small fix in resource
change the way gameMode is handled to esier handle them in view
preparing for different gameModes
fix conflict