Optic class cleanup