DAR-2107 | Cleanup, bugfixes