Remove some stuff that is throwing errors in gcc-7