some fixes. Outdated interfaces were removed.