Remove code causing error RP, and restore settings file