Removing deprecated code
Finish list models