cleanup todo's