Removing more stuff we don't need