Some additional cleanup