remove some to dos from code