sample changes cleanup