Made compatible with Bolt 2.0 development.

Removed unused variables and using public function that remains in Bolt.