Fixed derby cleanup