Remove hard coded layer name.