Be more careful with game constants
Remove unneeded defines