Codebase cleanup

More will follow.