Removed C cruft