Cleaer out of unused mods & bits

completed