clean up dependencies
Merge branch 'koert' into tresata