hammerhead: fixed and cleanup for thinkingbridge