Suggest that we put all of these keep/drop changes into customize functions as they are not generally needed