Removed function and class that were commented out