Class Cleanup

Cleaned up warning messages on these two classes, removing unused
imports and object declerations