Removing more dumb stuff