Remove waste codes