Remove tech todo for cleanup