Remove left-over logging
Fix choose_type