Removed Setup, Added to ViewController