Removed useless conditions
Added skeleton for naoqi utilisation