Cleaning up stuff that shouldn't be there