Clean up CLI-prop interaction for DSE