Cleanups to focus on Alfalfa (not Mosh!)