... And get rid of some useless ones