Removed hardcoded paths