Clean up in project and initialization of List/Collection management