Remove double auth check