Remove hardcoded path
Cleanup