Remove public/system