Added docblocs to User entity
Updated mapper with docblocs & removed unused (unreachable) code