BUG: cleaning up remnants