removing more stuff