Move cleaning of junit to seperate file