Remove unneccessary optimization.