removed presumably deprecated things