Update infrastructure and cleanup javascript