switched to bluebird 2.3.0, cleaned up codes