Fix - remove dead code