Removed a function that were commented out