Improve models deletion