Get rid of ugly 1-2-things