Removed deprecated C-style code