DAR-959: Code cleanup