Interface cleaning, update relative to console API