clean up ctor code
remove debug stuff