Clean up, and fix bug of old bundle reload. The grid dataset PR should be working now.