Yay cleanups