Update bundle
Clean up and simplify files