Clean up some unneeded includes & the ret value.