Fixed features not getting removed beyond max number