Remove VectorLayer import statements from refactored files