Improvements to way clear