[DF-5025] Fix review and merge issues, cleanup code