removed unused and unsupport code