Clean up Software Delivery in Secure Storage by using SMATool