Clean up

Remove what wastes tokens.