We might be more clever on this and do the cleanup conditionally, but
for now this is safe solution as the checks might become stale.

This completes fix for issue #233