Attempted Cleanup of ENABLE and REVERSE