Remove logic that became unnecessary