Remove the empty sections and do not add placeholders for them

Change-Id: Ia896f6daafccbbfd66c985d5d25d220a8a0895ff