Merge pull request #15 from kcarcia/organizing

Removing something
removing userpass