Cleaned up imports and warnings