clean up stock H5BP stuff, getting hang of this stuff...