removed todo's