Code and repository cleanup