Issue #134: Clean up imports
Issue #134: Deprecation warnings
Issue #134: Serializable warnings
Issue #134: Unchecked casts warnings
Issue #134: Unused field warnings