RF: cleanup