some cleanup of changes