Removing dumb conditional