Changed to use Console only
Cleaned up