ApiKey Authentication cleanup