CHANGED:clean up the codebase with CompanyService/LDAPService