significant cleanup of web stomp code