removed some functions that were commented out