General cleanup of compile warnings for redundant imports/functions