CLEANING UP REDUNDENCY