Revert "Fixes after"

This reverts commit fcc6f16b13f5e4245b7b39692900e3ad3f1ac4ea.
Revert "MultiSim: move getFormattedSimName() to frameworks (2/2)"

This reverts commit 073c34c39f02a497d1235c11189a1f3eaf6fb27e.