Updating for version 1.1 features.

Cleaned up some deprecated code.