Some cleanup, stop spamming emails