Cleanup for comments on run.  Also removed modular leftovers.