18 Remove obsolete codes