hercules: More cleanup