Added rpm query for package information & cleanup