unnecessary function removed