cleanup modelling tools