Fix: unite targets multiple iterations. Clean up