Refactoring

Sometimes it's good to do a compacting garbage collection of a project.