removed partial unnecessary function