Got rid of bad garbage collection call, and a few other minor enhancements to do with performance