cleanup of unused curator and simplification of dependencies