commented out some unused function calls