Removed commented out grammar rules and re-generated parser