Removing ConsoleViewController

And General Cleanup