You're right! Let's kill them. Could you please take care of this with a nice PR? :wink: