RFT: Removed some unused code