the great purge/refactor begins...