Removing Un-necessary Code