Removed unused code used for testing and updated some comments