#20 Remove unnecessary elements