libcommon: Cleanup