Cleaning up auth checking