update paths
Cleanup