More anal cleanups