Fixing smoke, FT and FT2 i.e. removing geo zone code from dbwrapper which doesnot exist