got rid of unsed code