Finishing up snippets, removing old macros