ARD: code cleanup
fix merge