Cleaned up deprecated code from older version.