More init script cleanup