Major cleaup on old modules