Further cleanup
Added /public