Refactoring: fast alignment non mpi cleaning