Added automator layer to help with cleanup