Added some garbage collection