Removed commented out code, API fix is go