Cleaned up code I had commented out because I'm not using it or it was for testing.