Fix contains and add! errors

Cleanup of files using deprecated functions to minimize errors when using package.