arrays added
cleanup dead vars