Tidied away vestigial code