cleanup Dan's model