Remove deprecated option check