Tidied some dead code