First real attempt to fix the S5 crash.
Removed unused code.

This code was added to prevent MCT from crashing on a S5. Now that
the crash issure is fixed (workaround) the code is no longer needed.
Merge branch 'master' into s5_crash_fix
Merge branch 's5_crash_fix'