Removed unused class and old commented out code.