diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 723bbee089..d62768a568 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -490,10 +490,7 @@ elseif("${SERENITY_ARCH}" STREQUAL "aarch64")
     )
 
     # Otherwise linker errors e.g undefined reference to `__aarch64_cas8_acq_rel'
-    add_compile_options(-mno-outline-atomics -latomic)
-
-    # FIXME: Remove this once compiling MemoryManager.cpp doesn't give the nonnull error anymore.
-    add_compile_options(-Wno-nonnull)
+    add_compile_options(-mno-outline-atomics)
 
     # NOTE: These files cannot use a stack protector and sanitizers, as these will cause accesses to global variables to be inserted
     #       by the compiler. The CPU cannot access global variables without the MMU as the kernel is linked for a virtual address in high memory.
diff --git a/Meta/CMake/serenity_compile_options.cmake b/Meta/CMake/serenity_compile_options.cmake
index 1c94e0c999..dbe88f7384 100644
--- a/Meta/CMake/serenity_compile_options.cmake
+++ b/Meta/CMake/serenity_compile_options.cmake
@@ -39,9 +39,3 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang$")
     link_directories(${TOOLCHAIN_ROOT}/lib/clang/${LLVM_MAJOR_VERSION}/lib/${SERENITY_ARCH}-pc-serenity/)
 endif()
 
-if ("${SERENITY_ARCH}" STREQUAL "aarch64")
-    # Unaligned memory access will cause a trap, so to make sure the compiler doesn't generate
-    # those unaligned accesses, the strict-align flag is added.
-    # FIXME: Remove -Wno-cast-align when we are able to build everything without this warning turned on.
-    add_compile_options(-mstrict-align -Wno-cast-align)
-endif()