Cleanup Part 2

More cleanup things done.