Trying to fix removecrap