Clean-up some old code
Clean-up some old code

citrininfo/netzke-basepack,skmitty/netzke-basepack,citrininfo/netzke-basepack,citrininfo/netzke-basepack,rvwong/netzke-basepack,skmitty/netzke-basepack,rvwong/netzke-basepack,skmitty/netzke-basepack,citrininfo/netzke-basepack,rvwong/netzke-basepack,rvwong/netzke-basepack,skmitty/netzke-basepack