Cleaning Up and Making Login Work again