Removed unused state
Cleaned up unused vars