removed the unused stuff