Add a remove bundle function
Fix some comments