Remove custom guid/token due to bloat