Cleanup and remove warnings.