performance updates
refactoring
removed unused dto