diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
index ec013657dc..94175b8187 100644
--- a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
@@ -35,7 +35,6 @@ BEGIN_INTERFACE_MAP()
     NSObject <IRenderTarget> *renderTarget;
     AvnPoint lastPositionSet;
     NSString *_lastTitle;
-    IAvnMenu *_mainMenu;
 
     bool _shown;
     bool _inResize;
@@ -76,13 +75,13 @@ BEGIN_INTERFACE_MAP()
 
     virtual HRESULT Resize(double x, double y, AvnPlatformResizeReason reason) override;
 
-    virtual HRESULT Invalidate(AvnRect rect) override;
+    virtual HRESULT Invalidate(__attribute__((unused)) AvnRect rect) override;
 
     virtual HRESULT SetMainMenu(IAvnMenu *menu) override;
 
     virtual HRESULT BeginMoveDrag() override;
 
-    virtual HRESULT BeginResizeDrag(AvnWindowEdge edge) override;
+    virtual HRESULT BeginResizeDrag(__attribute__((unused)) AvnWindowEdge edge) override;
 
     virtual HRESULT GetPosition(AvnPoint *ret) override;
 
@@ -115,8 +114,6 @@ protected:
 
     void UpdateStyle();
 
-public:
-    virtual void OnResized();
 };
 
 #endif //AVALONIA_NATIVE_OSX_WINDOWBASEIMPL_H
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
index bb40cd2a7e..9959d6a034 100644
--- a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
@@ -16,7 +16,6 @@
 WindowBaseImpl::WindowBaseImpl(IAvnWindowBaseEvents *events, IAvnGlContext *gl) {
     _shown = false;
     _inResize = false;
-    _mainMenu = nullptr;
     BaseEvents = events;
     _glContext = gl;
     renderTarget = [[IOSurfaceRenderTarget alloc] initWithOpenGlContext:gl];
@@ -279,7 +278,7 @@ HRESULT WindowBaseImpl::Resize(double x, double y, AvnPlatformResizeReason reaso
     }
 }
 
-HRESULT WindowBaseImpl::Invalidate(AvnRect rect) {
+HRESULT WindowBaseImpl::Invalidate(__attribute__((unused)) AvnRect rect) {
     START_COM_CALL;
 
     @autoreleasepool {
@@ -292,8 +291,6 @@ HRESULT WindowBaseImpl::Invalidate(AvnRect rect) {
 HRESULT WindowBaseImpl::SetMainMenu(IAvnMenu *menu) {
     START_COM_CALL;
 
-    _mainMenu = menu;
-
     auto nativeMenu = dynamic_cast<AvnAppMenu *>(menu);
 
     auto nsmenu = nativeMenu->GetNative();
@@ -323,7 +320,7 @@ HRESULT WindowBaseImpl::BeginMoveDrag() {
     }
 }
 
-HRESULT WindowBaseImpl::BeginResizeDrag(AvnWindowEdge edge) {
+HRESULT WindowBaseImpl::BeginResizeDrag(__attribute__((unused)) AvnWindowEdge edge) {
     START_COM_CALL;
 
     return S_OK;
@@ -431,7 +428,7 @@ HRESULT WindowBaseImpl::CreateGlRenderTarget(IAvnGlSurfaceRenderTarget **ppv) {
     if (View == NULL)
         return E_FAIL;
     *ppv = [renderTarget createSurfaceRenderTarget];
-    return *ppv == nil ? E_FAIL : S_OK;
+    return static_cast<HRESULT>(*ppv == nil ? E_FAIL : S_OK);
 }
 
 HRESULT WindowBaseImpl::CreateNativeControlHost(IAvnNativeControlHost **retOut) {
@@ -505,8 +502,4 @@ NSWindowStyleMask WindowBaseImpl::GetStyle() {
 
 void WindowBaseImpl::UpdateStyle() {
     [Window setStyleMask:GetStyle()];
-}
-
-void WindowBaseImpl::OnResized() {
-
-}
+}
\ No newline at end of file
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.h b/native/Avalonia.Native/src/OSX/WindowImpl.h
index fae53acc22..b229921baa 100644
--- a/native/Avalonia.Native/src/OSX/WindowImpl.h
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.h
@@ -88,8 +88,6 @@ BEGIN_INTERFACE_MAP()
 
     virtual HRESULT SetWindowState (AvnWindowState state) override;
 
-    virtual void OnResized () override;
-
     virtual bool IsDialog() override;
 
 protected:
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.mm b/native/Avalonia.Native/src/OSX/WindowImpl.mm
index 0b7f9e0a13..9cf5160c97 100644
--- a/native/Avalonia.Native/src/OSX/WindowImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.mm
@@ -504,12 +504,6 @@ HRESULT WindowImpl::SetWindowState(AvnWindowState state) {
     }
 }
 
-void WindowImpl::OnResized() {
-    if (_shown && !_inSetWindowState && !_transitioningWindowState) {
-        WindowStateChanged();
-    }
-}
-
 bool WindowImpl::IsDialog() {
     return _isDialog;
 }
diff --git a/native/Avalonia.Native/src/OSX/window.h b/native/Avalonia.Native/src/OSX/window.h
index 365172622f..271dd2534e 100644
--- a/native/Avalonia.Native/src/OSX/window.h
+++ b/native/Avalonia.Native/src/OSX/window.h
@@ -2,6 +2,9 @@
 #define window_h
 
 #import "avalonia-native.h"
+
+@class AvnMenu;
+
 class WindowBaseImpl;
 
 @interface AvnView : NSView<NSTextInputClient, NSDraggingDestination>
@@ -10,7 +13,7 @@ class WindowBaseImpl;
 -(AvnPoint) translateLocalPoint:(AvnPoint)pt;
 -(void) setSwRenderedFrame: (AvnFramebuffer* _Nonnull) fb dispose: (IUnknown* _Nonnull) dispose;
 -(void) onClosed;
--(AvnPixelSize) getPixelSize;
+
 -(AvnPlatformResizeReason) getResizeReason;
 -(void) setResizeReason:(AvnPlatformResizeReason)reason;
 + (AvnPoint)toAvnPoint:(CGPoint)p;
@@ -20,12 +23,11 @@ class WindowBaseImpl;
 -(AutoFitContentView* _Nonnull) initWithContent: (NSView* _Nonnull) content;
 -(void) ShowTitleBar: (bool) show;
 -(void) SetTitleBarHeightHint: (double) height;
--(void) SetContent: (NSView* _Nonnull) content;
+
 -(void) ShowBlur: (bool) show;
 @end
 
 @interface AvnWindow : NSWindow <NSWindowDelegate>
-+(void) closeAll;
 -(AvnWindow* _Nonnull) initWithParent: (WindowBaseImpl* _Nonnull) parent;
 -(void) setCanBecomeKeyAndMain;
 -(void) pollModalSession: (NSModalSession _Nonnull) session;
@@ -34,8 +36,8 @@ class WindowBaseImpl;
 -(void) setEnabled: (bool) enable;
 -(void) showAppMenuOnly;
 -(void) showWindowMenuWithAppMenu;
--(void) applyMenu:(NSMenu* _Nullable)menu;
--(double) getScaling;
+-(void) applyMenu:(AvnMenu* _Nullable)menu;
+
 -(double) getExtendedTitleBarHeight;
 -(void) setIsExtended:(bool)value;
 -(bool) isDialog;
diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
index a1d231f30a..fe80142f1a 100644
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@@ -1,3 +1,4 @@
+#import <AppKit/AppKit.h>
 #include "common.h"
 #import "window.h"
 #include "KeyTransform.h"
@@ -6,10 +7,6 @@
 #include "automation.h"
 #import "WindowBaseImpl.h"
 #include "WindowImpl.h"
-#include "IWindowStateChanged.h"
-
-
-NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEventTrackingRunLoopMode, NSModalPanelRunLoopMode, NSRunLoopCommonModes, NSConnectionReplyMode, nil];
 
 @implementation AutoFitContentView
 {
@@ -106,26 +103,13 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
 
     _settingSize = false;
 }
-
--(void) SetContent: (NSView* _Nonnull) content
-{
-    if(content != nullptr)
-    {
-        [content removeFromSuperview];
-        [self addSubview:content];
-        _content = content;
-    }
-}
 @end
 
 @implementation AvnView
 {
     ComPtr<WindowBaseImpl> _parent;
-    ComPtr<IUnknown> _swRenderedFrame;
-    AvnFramebuffer _swRenderedFrameBuffer;
-    bool _queuedDisplayFromThread;
     NSTrackingArea* _area;
-    bool _isLeftPressed, _isMiddlePressed, _isRightPressed, _isXButton1Pressed, _isXButton2Pressed, _isMouseOver;
+    bool _isLeftPressed, _isMiddlePressed, _isRightPressed, _isXButton1Pressed, _isXButton2Pressed;
     AvnInputModifiers _modifierState;
     NSEvent* _lastMouseDownEvent;
     bool _lastKeyHandled;
@@ -143,11 +127,6 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     }
 }
 
--(AvnPixelSize) getPixelSize
-{
-    return _lastPixelSize;
-}
-
 - (NSEvent*) lastMouseDownEvent
 {
     return _lastMouseDownEvent;
@@ -155,7 +134,7 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
 
 - (void) updateRenderTarget
 {
-    [_renderTarget resize:_lastPixelSize withScale: [[self window] backingScaleFactor]];
+    [_renderTarget resize:_lastPixelSize withScale:static_cast<float>([[self window] backingScaleFactor])];
     [self setNeedsDisplayInRect:[self frame]];
 }
 
@@ -345,7 +324,7 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     auto localPoint = [self convertPoint:[event locationInWindow] toView:self];
     auto avnPoint = [AvnView toAvnPoint:localPoint];
     auto point = [self translateLocalPoint:avnPoint];
-    AvnVector delta;
+    AvnVector delta = { 0, 0};
     
     if(type == Wheel)
     {
@@ -378,7 +357,7 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
         delta.Y = [event deltaY];
     }
     
-    auto timestamp = [event timestamp] * 1000;
+    uint32 timestamp = static_cast<uint32>([event timestamp] * 1000);
     auto modifiers = [self getModifiers:[event modifierFlags]];
     
     if(type != AvnRawMouseEventType::Move ||
@@ -437,6 +416,9 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
             _isXButton2Pressed = true;
             [self mouseEvent:event withType:XButton2Down];
             break;
+
+        default:
+            break;
     }
 }
 
@@ -470,6 +452,9 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
             _isXButton2Pressed = false;
             [self mouseEvent:event withType:XButton2Up];
             break;
+
+        default:
+            break;
     }
 }
 
@@ -523,13 +508,11 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
 
 - (void)mouseEntered:(NSEvent *)event
 {
-    _isMouseOver = true;
     [super mouseEntered:event];
 }
 
 - (void)mouseExited:(NSEvent *)event
 {
-    _isMouseOver = false;
     [self mouseEvent:event withType:LeaveWindow];
     [super mouseExited:event];
 } 
@@ -543,7 +526,7 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     
     auto key = s_KeyMap[[event keyCode]];
     
-    auto timestamp = [event timestamp] * 1000;
+    uint32_t timestamp = static_cast<uint32_t>([event timestamp] * 1000);
     auto modifiers = [self getModifiers:[event modifierFlags]];
      
     if(_parent != nullptr)
@@ -711,7 +694,7 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
 
 - (NSRect)firstRectForCharacterRange:(NSRange)range actualRange:(NSRangePointer)actualRange
 {
-    CGRect result;
+    CGRect result = { 0 };
     
     return result;
 }
@@ -730,10 +713,10 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
                 CreateClipboard([info draggingPasteboard], nil),
                 GetAvnDataObjectHandleFromDraggingInfo(info));
     
-    NSDragOperation ret = 0;
+    NSDragOperation ret = static_cast<NSDragOperation>(0);
     
     // Ensure that the managed part didn't add any new effects
-    reffects = (int)effects & (int)reffects;
+    reffects = (int)effects & reffects;
     
     // OSX requires exactly one operation
     if((reffects & (int)AvnDragDropEffects::Copy) != 0)
@@ -829,9 +812,6 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     bool _isEnabled;
     bool _isExtended;
     AvnMenu* _menu;
-    double _lastScaling;
-    IAvnAutomationPeer* _automationPeer;
-    NSMutableArray* _automationChildren;
 }
 
 -(void) setIsExtended:(bool)value;
@@ -844,11 +824,6 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     return _parent->IsDialog();
 }
 
--(double) getScaling
-{
-    return _lastScaling;
-}
-
 -(double) getExtendedTitleBarHeight
 {
     if(_isExtended)
@@ -871,11 +846,6 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     }
 }
 
-+(void)closeAll
-{
-    [[NSApplication sharedApplication] terminate:self];
-}
-
 - (void)performClose:(id)sender
 {
     if([[self delegate] respondsToSelector:@selector(windowShouldClose:)])
@@ -983,7 +953,7 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     _closed = false;
     _isEnabled = true;
     
-    _lastScaling = [self backingScaleFactor];
+    [self backingScaleFactor];
     [self setOpaque:NO];
     [self setBackgroundColor: [NSColor clearColor]];
     _isExtended = false;
@@ -1004,7 +974,7 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
 
 - (void)windowDidChangeBackingProperties:(NSNotification *)notification
 {
-    _lastScaling = [self backingScaleFactor];
+    [self backingScaleFactor];
 }
 
 - (void)windowWillClose:(NSNotification *)notification
@@ -1221,9 +1191,9 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
                 {
                     auto avnPoint = [AvnView toAvnPoint:windowPoint];
                     auto point = [self translateLocalPoint:avnPoint];
-                    AvnVector delta;
+                    AvnVector delta = { 0, 0 };
                    
-                    _parent->BaseEvents->RawMouseEvent(NonClientLeftButtonDown, [event timestamp] * 1000, AvnInputModifiersNone, point, delta);
+                    _parent->BaseEvents->RawMouseEvent(NonClientLeftButtonDown, static_cast<uint32>([event timestamp] * 1000), AvnInputModifiersNone, point, delta);
                 }
             }
             break;