remove a few additional unfinished modules
move to M::S