#21 Removed plug-ins which can be replaced by DSL code