Cleanup. Started on Artifact dependency dsl.