Found a bug :(
Cleanup a lot of code