Cleaned up test menu class. Cleaned up other things.
Took out performance things