Cleaning out unused functionality