cleanup of code around get/set extension unit and feature units