minor cleanup on battery patches