Some cleanup in Bolt.js
Merge pull request #1610 from rarila/bolt-js-leftovers

Some cleanup in Bolt.js