Cleanup up paths