Update to version 3.1 of Normalize drop support for REM this need to be moved to a different setup file