Minor clean
This one has big memory leaks
THIS HAS MEMORY LEAKS. FIX IT