refactoring:
Removed unused features
Cleared up token confusion