Remove gratuitious complexity