gatekeeper: More clean ups