Removed dead/commented off optimization code