Properly clear attributes on remove and death. Fixes BUKKIT-4416