RPA-6 some cleanup