Fixing dead code ..