[misc] cleanup