Better output deleting and better log warnings