ARD: code cleanup