Massive internal restructuring - part 3
Cleanup