Cleaned up imports. Fixed compiler warnings.