Trimming the codebase