Dropped auto-generated comments
Dropped unused class
Small code clean up, added comments