clean up / opticharger & squisher output changes