remove debug code no longer needed
cleanup datatypes
cleanup
cleanup