Remove no-op mode