Tidying up in the incompressible folder