Clean up old optimizer cruft