Cleanup todo comments and deadcode