Clean-up old code.