removing more deprecated crap