Cleanup/implicit scope