Update code 2.5

update classes and remove unused functions