chore: adapt code to conventions, remove dead code