Cleanup before merging updated Sail.js ported app