Cleanup

see commit messages