Cleaned up unused code.

Cleaned up unused code.