Removed unfunctioning optimization