Fix IT, added cleanup

To allow multiple invocations