remove tunet stuff
cleanup unused code