misc, extension cleanup [#326]