cleaned up rmf