removing more of this crap