OSNG-10 removed old attributes, changed the entities a little bit, wrote system test

removed old attributes: they were obsolete because we are now moving to SCIM.
changed the entitties: they were a little messed up so refactored them