Removed Dead Code, and coder violations.