removing deprecated stuff