Fix for removecrap