removed legacy comments
Removed unnessessary states