Removed username/password as unused