Cleaning out code