Moved some deprecated code to the archive