Minor cleanup in init scripts, setup script, and POM.