cleanup of usage and headers.