Game State Edit

Game States have been cleaned up to remove unneeded states