final cleaning of the raw code (for now)