removed unsed class
added comments