removed unnecessary functions, that were commented out.