I've just (half) removed my old-fashioned bottom bracket, and I still haven't got the lock-ring off - like you, andrew_s, it brought the rest of the BB with it.
I've got to work on the fixed cup tomorrow night - hopefully the WD40 will have worked in by then!