Added Login, Remove Unnecessary Code