Cleanup 1

Cleaned up excess graphical commands and debug code