Remvove unneeded entries