fixes and clean up
remove bear dep