Changes for 2.1.1
Removed last traces of the new freelist implementation