DAR-1727, remove old unused code