Clean-up from last change