Speech & map removal

@chrisn can you review/merge?