Remove unnecessary checks for addon id.