cleanup models and views