- Removed unused classes which should not be part of the core Schematic class in order to be interchangeable