Remove ancient code