Using app variable for Firebase URL now
Some cleanup, avoided Safari issue for now