Removing dead code from testing