removed some checks after auth branch merged