Removing CLike-related code