Updated drive_surface.py - cleanup