GPUB: drop deprecated stuff, parseTokenSmart & cleanup