fixes based on lint check:unused elements