removing stuff that we shouldn't have