TIDY UP of all modules