Rename property and Implement cleanup method