Too many versions and junks.... Clean up