Removed some deprecated imports and methods.