Clear up un-used code