More codebase cleanup