Added garbage cleanup