Several commands were missing the persistent pod -p option which was
added recently. This updates those remaining commands to have the
functionality.
Also fix an issue with calling the cleanup function where it would
execute twice in a row.
Cleaned up a few things in the code.
Change-Id: I5e9b535a7e34043b8aa9008d823452d854e9f4e6