Remove unneeded entries