cleanup
cleaning up, starting work on cdist integration