Bug fix: #388394
- using the proper methods to retrieve the list count
- deleted some deprecated methods