Taking out the slow things that Ben left in.
Merge remote-tracking branch 'lizzie/slooow'