Re: merge request: initscript cleanup