Cleanup Wrappers

*Yes, now hw_get_module_by_class works