Mod and Atty clearout

completed