Revert "repair dao and service and validation"

This reverts commit 5ca806609e9ebbc01d009c724eeb6d8a068d57e5.
repair dao and service and validation 2 :)