Remmoved unused code