UI-2882 Cleanup old source