*Removing unnecessary code