Cleanup iaw dojo guidelines