don't use 'p' as var
clean up rethink storage