Got rid of angularfire