libs not used removed
refactor: class renamed