Cleanup of EMC handling (again)