more cleanup!
get part working