removing more old code yay