Removed extra TODO