got rid of unused stuff