Get rid of useless elaboration