remove stuff that might be breaking things