Clean up of Console source