Fixed some unnecessary import violations/warnings. pelynch