Cleaning up from the last change