changes

[kainagel]

• remove things that were commented out
• comment out things that seem unused
• reduce public footprint
• some internal renames
• possibly other things