Removes unnecessary code and improves workbench support.