Warning cleanup, just deprecated remains.