Remove obsolet code remnant