Removing some code so we can use commands instead of GUIs