Some cleanup
Support for wai-3