Remove little optimization