Fix typos and remove some obtrusive code