clean up plugin store when removing data instead of setting the value to nil and do it a reasonable way.