Cleanup of the common library.
More implementation progress.