Remove unnecessary TokenVisibility occurrences
Convert Trimmer object to trait for easier usage