remove more internals from CoreStorage