removed waste code