Remove waste code