Additional cleanup