Clean-up the presence code.