Removed unsued code