removed $firebase calls