Remove unused optimizer (now in separate branch)