Upgraded to newer versions and did away with Firebase Simple Login