[PATCH] Remove nested feature sections