commented out some code to remove some memory usage which is not needed