Minor tidy, remove old configs, update specs2