update for bindable 0.5.x
cleanup