Add comments and remove unused classes