Some stub functions files are removed. Model is updated to accommodate skeleton of production market