Feature misc cleanup for osf implementation