Remove public
continue cleanup