OctOs-Fying CarbonFibers cleanup