Second pass at garbage collection

Just in case