Removed ws debug stuff and more cleanup