Added COMPLETE listener for cleanup