Removed maprfs flag where unnecessary