Merge pull request #337 from isururanawaka/production_new

clean up