REMOVED TODOS