Clean up some nonused bundle, add bug TODO