DAR-1496: Code cleanup