Remove unused code, uppercase notes, cleanup