Added garbage collection (finally)