Removal of unnecessary early optimization