CSR-85: simplifying -> removing unnecessary services and extra abstract form type.