Codemaid cleanup