Fix some stuff?
Remove old C version