Removing unneccesary tokens