cleanup implemented TODO note