Remove code made useless by clutter use