Cleaned up imports and removed unnecessary extension.