Removed some unneeded references to optimize