unused class removed
comments added