Update scotty and wai
Cleanup