Removed unused options, added password support.