Remove finaltools and add in common