Consolidate custom classes, remove uneeded