some cleanup around changes