More cleanup.
Removed unecessary dynamic allocation.
Got it!