Add cleanup method
Fix warning