Removed functions not being used and fixed a small bug with forgot
password