cleanup
include use_bundle in object by default