Clearout - various mods and things

completed