More cleanup. Still learning git...