Cleaned up unused code from previous change. Added a missing dealloc method.