remove Application dependency from Model