removed definitions that don't belong to original osC