Added some comments
Deleted unused methods and unused icons