- removing more dead code blocks