Remove redundent getId() methods from entities, refs T534