services/autocloak: Clean up