Cleaned Buffer Fix 03

Commented out token struct for now.