RF: Remove superfluous code