Cleanup public/