I found out os_get_bundles() has useless args so I removed them.
Please let me know whether you expect me to do those kind of cleanups on the way...