Cleanup of imports and lint issues