Removed optimization.