Fixed Memory Deallocation in Support Classes