cleanup before modularizing