1) Removed unnecessary shaders
2) Updates to the main window context code