Very small cleanup