Some cleanup on the bundle