remove hardcoded macro switch