scrubbed code of tree remnants @ev