todo - remove testing code