Clean up on XSP plugin