finish poc js cleanup