DEV: Remove friend class