removing more annoying things