Cleaning up #2.