test tidy up and deleted dead code