Adds better clean up to package process