MSM FB CleanUp and fixing