Cleaned up some unused imports and errant comments