- Refactoring (move Methods to identityMap and Remove useless methods