Removing Un nessary code