Remove additional setup steps

This requires GH437