Eliminated four dead functions that are never called