bit more random cleanup