cleanup pt 2 of modularization