Removed or marked with a TODO?