removed optimization