removing more unnecessary crap