minor cleanup removal of uneeded declarations that aren't driver version specific