removed tunedin specific stuff