Removed statements that were commented out