MODE-650: Fix parent types. Removed unused classes