Remove unless statement