Removing some useless entries