cleanup and update to latest chem