Remove some more no longer needed synthesizes and private categories