keeping it simple, removing tokens