undo previous optcomp hackery

this was all moved to conduit