Remove code which has become redundant