Removing helpers to hide tokens