DAR-712, formatting cleanup
DAR-712, remove deprecated dependency