remove depreacted stuff