Change to InvalidArgumentException
Remove class because no service