deleted interfaces and moved models