clean up unneeded methods
updated to latest curator
remove use of namespace (add paths manually)