continuing to remove stuff we don't really need