more cleanup related to web stomp refactor