Much cleaning

Cleaned up a lot of stuff