Added dead code deletion