FIX cleanup obsolete comments
FIX avoid unnecessary query to casub collection
FIX some issues related with memory management in the csubs part