updated version;cleanup