Cleaned up EntitySet imports