Removed dependence on optimizer code