Fix #293 and clean up derbis