Removing more stuff that doesn't really belong