Amputate vestigial code