more cleaning up

duplications removed