fixed legacy code
removed same core libraries