Remove stuff that shouldn't have been there