[misc] Cleanup