Remove unnecessary entries