removed comments and unused class