That's not a cleanup function. ... THAT's a cleanup function.

Misquoting Crocodile Dundee for the win. ;)

Change-Id: If1158495f23da40c457f753d23e69dce6664424b