1. Removed unsued code