Remove unnesecary token creation