Removed additional dead code.