hercules: update and remove some stuff

Change-Id: I50a64bd3e6884e6e23240230aa210971f220eef2