removing todo its a bad idea