taste : cleanup