Some random cleanup