Name correction, remove unused lines, suppress warnings.