Reverted feature.hpp and rf-prepare.cpp to a previous commit