Cleanup of helper files