Cleanup

See commit messages.