removing more stuff that doesn't belong here