[#183] Turned off location and oragnisation