Added SignOut and did some cleanup