removed unused function
fixed UT