Removing -q switches