some cleanup after merging dao-impl