more random cleanup