Removed unused code
Added TODO