Removing useless main modules left in from 2.0