Cleaned up merge

Removed lines added by the merge, and removed ldapjs module.