general cleanup - remove old rb2 code that is no longer applicable