More cleanup, I guess? Git is weird.