osc: Major clean-up, lots of commented-out code removed