Cleanup!

See commit messages