Removed ugly Tokeur-stuff