Documentation and cleanup
Remove more garbage that couldn't be split from token before