Added comment
Commented unused method
Removed unused TODO