Removed old C functionality