todo's removed