cleanup models and implement menu actions