Removed the prop memory leak