More cleanup and check macros