Some slight changes in how removecrap is handled