The great purge

Pre-work for version 2