Cleaned up warnings, unused methods
This class is no longer used/necessary
Removed this test, no longer necessary