Merge "Fix missing classes and remove unnecessary"