Cleanup a bit... remove host and usernames