cleanup of old vector code