* cleanup and registerbundles added