lots of cleanup
might need guys help
stuck with angularFire