Removed unused token code
Added settings