DAR-1498 Cleanup