Minor removal and fix