dead code and comment removed