got rid of unused code