Updated functions and Removed Extra files