Added correct dealloc methods