fixes based on lint check: not needed layout elements