Misc clef stuff
Cleaning