Remove no-op if statement