Remove commented-out cleanup code

Signed-off-by: John Else <john.else@citrix.com>