removed dead code blocks