Cleanup `public_dir` handling

Cleanup `public_dir` handling