Refactoring of the simplex module, cleanup