cleaned up dirc