Removing only_if conditional