Removed some rf1 dependencies.