[1] A fix for performance degerdation of metadataLog announcement [2] Code clean up