staging: thermal_framework: kconfig: cleanup from merge
block: elevator: cleanup from merge