Remove obsolet code