Adjust more binds for 6.0.2 and remove old code