multiple fixes to remove files and new adjustments for pricing