Reduce the setup by one step