Deleted unused classes and removed orika from dependencies