Stripping out a few non-essential themes