removed pim and other stuff