cleanup after modularization pt3