remove unreferenced items from layout

Change-Id: Ifdc883ea83abb31aa7cac866eb9f353a26cf0391