!define exit code should not be needed anymore