Fix: user name is not mapped

Cleanup of not used code