Cleaned a lot of stuff