cleanup and fix for servo