We're done. (For now)

Can this code be moved to tests and/or deleted?