revert support, core44_base and contact to fix errors