removed unused function
removed unused variable