Merge pull request #2633 from nicolaasmatthijs/listsFollowup

Removed unused code
Merge pull request #2642 from nicolaasmatthijs/listsFollowup

Lists followup
Merge branch 'newframework' into search