More effective to simply use a custom list here
Cleanup