Removing some functions that were commented out but not removed

also correcting some odd formatting with mixed tabs/spaces