Added comments and remove unused class