Clean codebase