Merge changes I3e41e51e,I9c80c345,Ia2abed25

* changes:
  Remove dead code (3/n)
  Extract verication code to a new class (2/n)
  Move code processing inherited files and libraries to its own method (1/n)