Removed obsolete allocations
Removed dead code from debug session