FIXED:
Cleaned up memory leaks