Revert "Contactstorage"

This reverts commit 1154bebf822b52c7ba2ead5f093570faad86f94d.