delete duplicative code
more cleaning oc code
cleanup more code
move code around
new method of sharing code