removing the waste code