Clean packaging and delete hard coded path