I'm removing some of this and will get a conflict here but that's fine. I'm removing the use of Application and AppVersion models.