Removed secureMode/interopMode related code for now, will do it again the day it will be available in SDK + minor improvements