Remove more obsolete commented code
Factor out shared driver functionality
File naming