SIM cleanup

This PR include few minor clean-ups which should not affect results.