Remove unneeded FrameLayout