Removed Extra Code