Adding TODO for clean up