i9300: fixed and cleanup for thinkingbridge