commented out some unused lines