Remove unused class
Fix map-method for results