Some Codekit-related clean up