Cleanup of duplicate class.