Remove .hapi references. Closes #2125