Government to finish IPP legislation 'by September'