merge request: initscript cleanup