Removed last traces of C-code