Remove some more old 'light compile' code