Cleanup for CodeKit