remove stuff that shouldn't really be there anyway