Remove unnecessary comments and adapt to new sh script