move deprecated stuff away
more cleanup