cleanup a bit more